Merge commit 'de016eef' into mit

* commit 'de016eef':
  Add telephony-common and mms-common to BOOTCLASSPATH