Merge "Add entries to hiddenapi light greylist"