Merge "Rename CallbackRecord to CallbackEntry"
am: 63fea675c7

Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266
tree: 1eb298ba5122c6458e73b7d0786c5d821efde300
  1. core/
  2. services/
  3. tests/