Merge commit \'f0c8ca7f09ed9a827e5c79e019526e8f2c77eeb4\' into manual_merge_f0c8ca7
am: 40be36d427

Change-Id: I5b191e1e741a0649a7ba84b15c8ccceda762b5d4
tree: 18e672f82e9dd809b786c0bdb947694079cc9f1a
  1. include/
  2. libril/
  3. librilutils/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk