Merge "Fix ADB, and a typo in BoardConfig.mk"