This reverts commit baa93cc651. Reason for revert: amlogic build fixed Change-Id: I8b046dc810d47a2d87012f02a668873889fce705
baa93cc651