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