Merge "Don't include android-base/macros.h from android-base/unique_fd.h"