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

Change-Id: Ia0f9214c51370fa6160652614bc39504e237246b