am a1af0d7c: Merge "Fix SDK build" into gingerbread

Merge commit 'a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp

* commit 'a1af0d7c80a0119630926810644e6cdee481ba80':
  Fix SDK build