Merge "Instrument telephony-common when EMMA_INSTRUMENT_FRAMEWORK is true." into nyc-mr1-dev
am: 9dab89f2ed

Change-Id: I5e818fc34370573460844b9e3dc7a7fed4320ac8
tree: cc2c57e33c23250ec8accc36e0ff8978574088aa
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt