Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h"
am: 090003a

* commit '090003a8d19899abe3cb3126a89b9f5a97b52f57':
  Don't include android-base/macros.h from android-base/unique_fd.h

Change-Id: Ibad9225be050ff04077889a7b83cdf232112fb37