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

Change-Id: I66b274bd276f851599135d43a318f5f543db07a0