Merge "Add junit target as replacement for junit-targetdex"
am: 18106331dc

Change-Id: Ieaf665c891966ac02901945f81b6a198fde5175a