Necessary after change in makefiles from AOSP commits 21cf84f8b3 and 4a064d2010. Test: Run layoutlib tests from IDEA Change-Id: I7359c5f41726972c45ff99f34ed5ecb036946034
Prevents errors due to mismatch in junit version. Change-Id: I2adf32efb16472aa5f5e51025b6bb75afc76a8b4