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

Change-Id: Iad9c94ec28540da8bc398b6f65102c15161649e0