Merge "Ril reconciliation" into gce-dev
tree: f2039471a346226571ffdfdf025c72fce074d17c
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk