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 am: 5dc550a90a am: f886915a89 am: ff0d31f917
am: 6ff46d5568  -s ours

Change-Id: I7a7ba2672dff1d587670138ba8285c8df27490fc