Merge "Merge "apilint: Allow parsing 3.0 signature files" am: 34b11c92b3 am: f9cd2cb759 am: ea23830f1b"