am 54bc5861: am 2cc051bf: am 9f28d790: Merge "Fix Mac compile error in debug_frame_writer.h"

* commit '54bc5861012265f8e36b97666595be67bffbfd33':
  Fix Mac compile error in debug_frame_writer.h