Merge "Remove public API methods from hiddenapi-light-greylist.txt"