Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ab7829b032
am: 5ea4906406

Change-Id: I8f2b34d764e92a7c8b6e434260a4c484a8cbe313
tree: 75f6f3130153e149034b591f314c565fd0bd5ab0
  1. vda/
  2. Android.mk
  3. MODULE_LICENSE_BSD
  4. NOTICE