Merge "Remove old APIs that are no longer used/implemented"
tree: b063784b6108528ca038133d839d8a78591999b9
  1. framework/