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

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

Change-Id: I4aebfc31bea7225232636bae56e92a9460a5d6fb