am 2e0f6715: Merge "Further optimize media scanner."

* commit '2e0f67159afa03133772d89f2d346b69a352a6eb':
  Further optimize media scanner.