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

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