Merge "Fix mediadrmserver segfault in GTS tests" into pi-dev am: 4ed61f3f1b
am: 82c5de334b

Change-Id: I062208529bc459c0b38e8b2d27eeea8b5ce97c85