Merge "[DO NOT MERGE] Build CTS tests as multilib apks" into marshmallow-cts-dev
am: 308b825102  -s ours

Change-Id: I9278463bcb8f83f965e3b45931bd2e5360a0826e