Merge "Merge "Merge "[DO NOT MERGE] Build CTS tests as multilib apks" into nougat-cts-dev am: 3697317567  -s ours am: 931f109723 am: 563abd6332" into nyc-mr1-dev am: 289c7180db am: 07849eb6b0 am: 2dc05a7d73  -s ours am: daa7df62fe am: 12d301a2ec" into oc-dr1-dev-plus-aosp