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