Merge "Build CTS tests as multilib apks" into lmp-dev