Merge "Merge "[DO NOT MERGE] Build CTS tests as multilib apks" into nougat-cts-dev am: 3697317567  -s ours" into nougat-mr1-cts-dev