Merge "Fixes incorrect flag info for the inheritance hierarchy file." am: a022e47a0b am: 09ef370c20
am: 82f9766348

Change-Id: I53fc0cfb4ac272258c43c6a2d81e6c109b37dcd9