Android 5.1.1 release 37
Merge "Make tinyxml multilib both on the host."