am 14d8e6e5: Merge change 23609 into eclair

Merge commit '14d8e6e5d5503fe420bb3276d367cba1bfba03f9' into eclair-plus-aosp

* commit '14d8e6e5d5503fe420bb3276d367cba1bfba03f9':
  Fix SDK build breakage.