Android CTS 5.1 Release 25 (4400433)
Merge "Add LOCAL_MULTILIB := both for host targets."