Merge "android.core.tests.libcore.package.tests: fix build breakage" am: f38c09e
am: e459f52

* commit 'e459f52208f421bf1614a4747b4c585c9ddf5f7d':
  android.core.tests.libcore.package.tests: fix build breakage

Change-Id: I1f97a147a6aaf9394525f22f718b18c9d26781fb