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

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