am 615d7839: am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev

* commit '615d78399d3c2936db113a61a3f9804fdd3f597b':