Android CTS 5.0 Release 7 (2906672)
Merge "Make tinyxml multilib both on the host."