Merge "Nice error for global include of binder/Enum.h"