am 6203d3e6: Merge "Bump oat file version due to apparent recent code/runtime interface change"

* commit '6203d3e68909b97ba5941bbe97c6bf6f4998f379':
  Bump oat file version due to apparent recent code/runtime interface change