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