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

Change-Id: Ia23b92d8ff16f54d8be28ea222ea1caeb08e46b5