Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
tree: d7dd2ed918ac50ee89742260a49d3831141077d1
  1. core/
  2. services/
  3. tests/