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

Change-Id: I5fc596125fe8a2ad1c5f0903e7aa73a733c43970