Merge "Restore conditional compilation blocks in VSOC RIL." into gce-dev
tree: 69cf86c204d098572739521a262891b5ac5de2bc
  1. common/
  2. external/
  3. guest/
  4. host/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. BUILD
  9. WORKSPACE