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