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

Change-Id: If668966afea7bbe5342cc62972e9537bdd76bdce