build: All in one commit for anroidarmv6 changes

Change-Id: I951aea15fa6c652038c86a1343114a56bf4c6dfa