Merge "SDK bump plat-tools." into honeycomb