Merge "Move file_contexts for APEXes to under /system/sepolicy"
am: 6a9a852dbd

Change-Id: I293a0629c9b7007f3c23374f9d3bb110583a708c