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