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

* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.

xorware/android_build,see4ri/lolili,ND-3500/platform_manifest,Hybrid-Power/startsync,xorware/android_build,xorware/android_build,knone1/platform_manifest,hagar006/platform_manifest,xorware/android_build,fallouttester/platform_manifest,xorware/android_build,pranav01/platform_manifest,RR-msm7x30/platform_manifest