am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp

* commit '1a087f0f01e4ea6900e5d922df68cbe908d6d1c9':
  Add external dependency API.
tree: ad36082e999d592b5b01a9c621b0479aeb95645f
  1. core/
  2. services/