Merge "Make privileged apps always keep uncompressed dex files." am: 3a5c65ef2f
am: 65c8bc6695

Change-Id: If3c942d070db8423d9e45218cfc73bbe389b5648