Merge "minadbd: Move to Soong." am: 56160b2b03 am: 734f76fc38
am: 15bc28727a

Change-Id: I51aa80a837c67e52be7253031cd43294cae29b0e