Merge "Add jack-jacoco-reporter to prebuilt sdk tools makefile." am: b57cab3ccf
am: 1dd2ee2cd1

Change-Id: Id4a4d01302fe9368af51c339e1562cee3658b244