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

Change-Id: I14d3e59f1f0274f2e5d06ed96c180d8472f8637d