[DO NOT MERGE] Build CTS tests as multilib apks am: f85312f56b  -s ours am: cdd83df2b2
am: 1ec5963617  -s ours

Change-Id: I1835ba967175b4be0b75706fdcaa934248949c7c