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.