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

Change-Id: Ia258a9b27b1b66c17f5c142671132241dc4fdd63