This reverts commit ce4ff9c4. Reason for revert: broke master in ab/5138164 target sdk_phone_armv7-sdk Change-Id: Ia4b0c7e6117a37df694509078116963f41d7865e