am 38f48e61: am 3cfbb4af: Merge "Clean-up 116-nodex2oat unit test"

* commit '38f48e618338d9ccbfb576f87a8c9a78a1bbf2a9':
  Clean-up 116-nodex2oat unit test