Android CTS 5.0 Release 7 (2906672)
Merge "Add LOCAL_MULTILIB := both for host targets."