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

Change-Id: I3cef98f345691ba72d3fdc169d9c819d6eaa4d7a