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

Change-Id: I669e96d79fc5dd7247ac75b6defe856ec74fe6d6