Merge "Re-enable tests for no-image & jit." am: f5dcd31d89
am: 77fc032bd8

Change-Id: Ib4b7431fda76fcdcc28907c6d78fbc6ba305620b