Merge "CTS tests: opt-in to multi_abi, opt-out of Instant App mode."
am: 299c6aa715

Change-Id: I04dff45f1d3bdf83ea7f881d6494a9af78b06e6a