Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev