Merge commit 'cd88d8e44ea735b3901d2af8df4d8cc488e9e1fb' into manual_merge_cd88d8e

Test: Build
Change-Id: Id424530d08378b23b3ae35d6b0e2c568f3a79275
tree: 8a1207dbf028c1c8d2af167f12df36d345639e3b
  1. include/
  2. libril/
  3. librilutils/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk
  7. OWNERS