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

Change-Id: Ia41db0285e9b5e754645877557093492f619d781