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