Merge "Move media configs system->vendor." into pi-gce-dev