Some catch-up with the sepolicy in AOSP master.