Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread