Merge "Move file_contexts for APEXes to under /system/sepolicy"