Simplify decision of which is the best oat file.
am: 70a8426705

Change-Id: I6dba62a2eb73d74cea86866da121ff4016858b70