Refactor oat.h.
am: d3d00c06a4

Change-Id: I0c5370f42f68fff1c3179a4a09dff7b7947a1033