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