Merge "Copy jacoco-cli into dist directory" am: de8d9e2abf
am: 8087f52bc1

Change-Id: If3296c04441a51367b60fe90776f29894be3d19e