am d8ad6c98: resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp

* commit 'd8ad6c98086c410243e0e8ad8285f02d6b696bd6':
  Enable QEMUD pipe connection
tree: 187c3ff3ab765d761e2758f63ddf409b34e94930
  1. include/
  2. libril/
  3. mock-ril/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk