androidarmv6 swapart merge

Change-Id: Ib2fbb690584a681fb87bc394b8a290e4601fc2d5