am 805f4061: am 458d91b0: Merge "Prevent undefined behavior in RosAlloc."

* commit '805f4061d43b2617df7a235fa2e79e583925b111':
  Prevent undefined behavior in RosAlloc.