Merge "Stop jarjar-ing apache harmony tests"
am: e3507320df

Change-Id: I0aa5af8e0be8c33676bffb95b8b218216287daca