Fix missing struct member
Merge branch 'android-gdb_7_3-base' into android-gdb_7_4-base
Merge branch 'android-gdb_7_4-base' into android-gdb_7_5-base
Merge branch 'android-gdb_7_5-base' into android-gdb_7_5