am 9a2f5113: merge from open-source master

Merge commit '9a2f5113fd1db1e1605daad47b16b6f960045582'

* commit '9a2f5113fd1db1e1605daad47b16b6f960045582':
  Add timer delete support to rild
tree: 53b232f8c3e714d0a6151b84ae635176f6c3a285
  1. include/
  2. libril/
  3. mock-ril/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk