Merge "Merge "[DO NOT MERGE] Build CTS tests as multilib apks" into nougat-cts-dev am: 3697317567  -s ours" into nougat-mr1-cts-dev am: c88e1681cb  -s ours am: 78291b74b7 am: 80a4aa6de9 am: a6519a00ef  -s ours am: 33343326d9
am: b2eee0c731

Change-Id: Ic541f83fe620531e65157fe5c95a9d2011e841cb