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