Merge "RIL: Allow rild to lock /vendor files."