Merge "More granular vendor access to /system files."
am: 6816044271

Change-Id: I74d379a088d49e2bb24cd04732dfba8921d3230f