merge changes from androidarmv6

Change-Id: I23276b6aed31d6c662d37b1164fdcb3c24cde6e7