Merge "adb / libbase: clean up NOGDI and evil ERROR macro"