Merge "Move file_contexts to under /system/sepolicy"