This reverts commit 981ea77f. Reason for revert:. Broke non-neon builds Change-Id: I52b298b00f98052ef5f249f88f853b0172aed3de