Revert "am 9a2f5113: merge from open-source master"

This reverts commit bb1375f6bdc6cf7d8c3642367cf35565ddb094a8, reversing
changes made to ca5e347ce4b2b51385c4b7395d51c30498c41a6b.
5 files changed
tree: 1a412f9d1ffb73e49fd8c01838201f63450d4968
  1. include/
  2. libril/
  3. mock-ril/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk