Merge "Do not run init CTS test on secondary ABI" am: be49555bca am: 548ad58a2c
am: 8a836a860a

Change-Id: I1c2f159977b86ed98e8ef0c82e4101adcb186ce0