Merge "Merge "Revert "[DO NOT MERGE] Build CTS tests as multilib apks"" into lollipop-mr1-cts-dev am: ce8c2cc3d6  -s ours" into marshmallow-cts-dev
am: ec0aeb071a  -s ours

Change-Id: I6285638bf8b9934eff0de8cb66e8d1feefd45826