This reverts commit f612656adf. Reason for revert: breaking amlogic build Change-Id: I129b5cb74259c9c028483e84c9b2ac3597c24701
f612656adf