Merge "Update gdb to 7.11. am: 5102a42dbb am: b6a258e04f" into nyc-mr1-dev-plus-aosp