Merge "Clean up UpdateOatFile for app images"
am: 7f1551d28b

* commit '7f1551d28b3674799a4bb2b198bf6b16f32082af':
  Clean up UpdateOatFile for app images