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

Change-Id: I4dab52887752e39c15707561f97f84fed68d97fd