Merge "Migrate hosting gts-media to our own x20 directory" into pi-dev
am: 9bb0162396

Change-Id: I32588786fc2b22fbe9eabf3ab970628385222f02