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

* commit '2910e15a5c67821c935e310ca51772d82095def2':
  Fix oat_file_assistant_test's ReserveImageSpace().