am 98d1803d: Merge change I11f66b41 into eclair-mr2

Merge commit '98d1803d4d00540695c63c0d52361e8e784d043e' into eclair-mr2-plus-aosp

* commit '98d1803d4d00540695c63c0d52361e8e784d043e':
  Remove unused SOURCE_ID constant.