Merge "Support for APEX updatable sepolicy"