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