Merge "Sync tools-common-prebuilt.jar from git_master."
am: 5b8e2b25a6

Change-Id: I175fa7229d79ce2e22cac8180269c45ee9bd5fa4