Merge "Ensure that overrides work in presence of package-private methods."
am: fc5fbfc13f

Change-Id: Ib08c36a72f9e1a65aeeece410e41cc8d93e5d238