Merge "Split vendor's system prop overrides into vendor partition"