Merge "Revert "[DO NOT MERGE] Build CTS tests as multilib apks"" into lollipop-mr1-cts-dev