am 3d8f0d1f: merge from open-source master

Merge commit '3d8f0d1f550c3bf16fe850f7affee2588933a55b' into kraken

* commit '3d8f0d1f550c3bf16fe850f7affee2588933a55b':
  Fix some bugs in CTS telephony tests for SMS.
tree: b0d08c9fd33675063cb0e6db49beca53fe164b13
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk
  5. CleanSpec.mk