Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev