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