Merge "Remove armv4t support." into dalvik-dev