Temporarily reverting this to allow investigation of a couple of BUGS BUG=aomedia:881 BUG=aomedia:887 (merged into #881) This reverts commit b1d3eda9. Change-Id: I2605deb7b8fefa4236d78c8695025dc42316edd2