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

Change-Id: If31b5229292ec342e73939e1d9f616cb02df1aa5