Merge "Bump oat version."
am: 1882c2295f

Change-Id: I23e1fb19466d06943aeb5642c0ca71cbe9ec6583