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

Change-Id: I4b7bbbc537d790f14b052bd6eefa7778366fac07