Merge "Added core-junit-static for use by frameworks/base/legacy-test"