Merge "Neverallow vendor code access to files on /system."
am: a813114831

Change-Id: Idf41a715fd959069be989a2d2000c21afad6290b