merge from open-source master

Change-Id: I7ce5870268166dffb6fabffb45b325b57dbe6ef0
tree: 46c0518064e8306637c58440b8b0b64a1d18eb69
  1. include/
  2. libril/
  3. reference-cdma-sms/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk