Fix build

Change-Id: I5036b6530954897c8c03da90765efda4118b041b
SECURITY FIX: Fix package uids being reused between uninstall and rei…
…nstall of different packages.

Policies for older packages were being granted to the newly installed package that got the recyled uid.

Change-Id: I13e00ee5d2bfad8d11ce043536e9d2894b61a6cd
Merge commit '943e6eda2ecf7e26b775a053a46a7981ea6b52bf' into pa3