Merge "Do not run init CTS test on secondary ABI"
am: be49555bca

Change-Id: I72d866852392b818a0b802a2a6b673ea247bbd83