resolve merge conflicts of 77eb76c to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic7897aba8a92273bd5939417628963ef2304556f
tree: fce3eb8b7610101c2835b0deb06601cf25b201c0
  1. include/
  2. libril/
  3. librilutils/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk