[automerger skipped] Merge "Add MediaExtractor hanging tests" into qt-qpr1-dev am: c0c51cd229 -s ours

am skip reason: Change-Id I909549a738471a2e170a5257ef1cbe2f91a60c83 with SHA-1 4379f03c75 is in history

Change-Id: If4dc8adac2a3afd3dbca599e7b6516307a09ad97