am d185494d: (-s ours) am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread

Merge commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f'

* commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f':
  Port mock ril controller and tests to GB. DO NOT MERGE