am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"

* commit 'fb5869e9ff378d6834d0eaf970543a2f417c4103':
  Add a class to encapsulate getting the metadata URI
tree: 3585e6a5a12a9aad81c37d00577226d5dc06d039
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk