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