Merge "Parse "private" methods/fields in text ApiFile parser" am: d919184b60
am: 906ccf2eee

Change-Id: I7fedd88a7e56e8a09e597b76266ff6989f82ce1b