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

Change-Id: Ib8718d862582b3a747a7e6cfb2ee93fad1bc72ca