Merge "Remove junit-targetdex as it is no longer used" am: 3a86064f04 am: 28444e9452 am: fc83ac5b2c
am: 5d47be3062

Change-Id: Iccb329bb58b29aa646408a4a1bfbcb6e7542ce31