Fixing use of subId where phoneId was expected.
automerge: d713365

* commit 'd7133654b09bffcada982d2a5d37d0eeb0ffbd2d':
  Fixing use of subId where phoneId was expected.
tree: 2158fbfc00780c8ec20cfb8912ea75e66e0ea426
  1. src/
  2. Android.mk
  3. CleanSpec.mk
  4. README.txt