Merge "Bump oat version"
am: 596c58b3dc

Change-Id: I6d1913f57e3f9336b14835dc4ce0792fe9a0b2be