Android CTS 5.1 release 6
Merge "Add LOCAL_MULTILIB := both for host targets."