Merge "Apply crosvm_defaults to adhd modules."
am: 0297e0f98d

Change-Id: I61014d00836e80b70908aa1021344faa18732231