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