Merge "Comment out checks on oat files." am: 87e61d51be am: e53faf8395
am: 17680447dc

Change-Id: I0c2d5d5e2d9b49db61d79adc59ea71a18e2f2425