Merge "Cover framework code in hiddenapi-mappings."