base

Merge change 1967 into donut

* changes:
  Document the media scanner's flow through native and java code, since I always forget how it works after a while.