Merge "Change location of make_lock_guard" into gce-dev
tree: 278885d653229df4365cca49a88f12f8fd7d3563
  1. common/
  2. external/
  3. guest/
  4. host/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. BUILD
  9. WORKSPACE