am 0c0a6caf: am dff05caf: am 4af290af: Merge "Remove the --gen-gdb-info compiler option."

* commit '0c0a6caf57a4c0bd08fa9ea7eb89d0c1e43c7afa':
  Remove the --gen-gdb-info compiler option.