Merge "Fix tools_r10 SDK build." into tools_r10