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

Change-Id: I496588bc3663e00be3b4138bb73ddece9896268c