Merge "Move mapping_sepolicy.cil to /system partition." into oc-dev