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

Change-Id: Ie3d66d331257a1ee17abf38d46bd8affe120c9c4