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

* commit 'b7930843d3f0d003ff44a3485a63a123ded6f1cb':
  adb / libbase: clean up NOGDI and evil ERROR macro