Merge "Add junit/textui/** to the proguard filter" am: 3b3bffc0d0 am: 5022a346c7 am: b61544dd73
am: e101faa214

Change-Id: I6685669902e80ca9eb22271d5168ac42d0a1ff94