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

* commit 'bb39bd30d7cb901d75c961556f206ff9218daed3':
  Release MediaFrameworkTest wakelock in onPause