Refactor oat.h. am: d3d00c06a4
am: 3edb718fcb

Change-Id: Iedd410aaeab912effea52ba1a8dc89ecff385ac7