Merge "Reconciliation for oc-mr1 branch specific changes" into gce-dev
tree: 26657120f8761418606b908e3b37e342dd30d61a
  1. common/
  2. external/
  3. guest/
  4. host/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. BUILD
  9. WORKSPACE