Merge "Use precompiled sepolicy when available" am: dda9cbb350
am: f9ac2fa7b2

Change-Id: I6a381f1c5ac7250c2d5de8fa082593f82e5834a9