Merge "Convert external/junit to Android.bp" am: 885334531a am: 833c14eda2 am: d9fab9d84a
am: 6f3aa13817

Change-Id: I1abea99c3510b9cd11567b59591c0f15444f425d