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

* commit '3cfbb4aff30f32e49b3b57c7483ee0b5cb580e7b':
  Clean-up 116-nodex2oat unit test