Merge changes Iccc3a445,I82ce80a4

* changes:
  MTP: Implement GetNumObjects
  Clean up MtpDatabase API.