am df44bd1e: Merge "Release MediaFrameworkTest wakelock in onPause" into jb-dev

* commit 'df44bd1eb9c8ce9890ed509dd8e71e863dce6247':
  Release MediaFrameworkTest wakelock in onPause