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

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