Reduce the visiblity of methods to be protected.

These methods should not be exposed as public
methods since they are meant to only be internal
to the class.

Change-Id: I471bdb90c77844217c895e24eb6f3b4d625d41ec
Adjust the parsing of incompat. requirements.

Parse the incompat. requirements first into a
dictionary of name -> lines and then output
the lines instead of outputting them while
parsing.

Change-Id: Id0bdf74543fbc2496281835cf0c749332818b784
Merge "Reduce the visiblity of methods to be protected."