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

Change-Id: Ifc8de6694ed0b9c5fd9615e54e39c8b408e94c70