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