Merge "Consolidate adb trace macro defines into its own header file." into lmp-dev