Merge "frameworks/base: Remove unnecessary core-tests dependency" into nyc-dev