Merge "Fixes incorrect flag info for the inheritance hierarchy file." am:...
Merge "Fixes incorrect flag info for the inheritance hierarchy file." am: a022e47a am: 09ef370c am: 82f97663
am: 0d9557a5
Change-Id: I23523009ebf1e389abbbf96ec6eee097de7a223d