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