am 28609928: am 2910e15a: Merge "Fix oat_file_assistant_test\'s ReserveImageSpace()."

* commit '28609928be722210035cc099a75a0ad82f46575c':
  Fix oat_file_assistant_test's ReserveImageSpace().