Merge "Added core-junit-static for use by frameworks/base/legacy-test" am: 0547748be0
am: 25fe9e56f7

Change-Id: Iacebdb845f914ea7a09d695b74e5f88063214e0f