Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2
am: 32aeca8e78

Change-Id: I72b99fb7974be9e735cdd8637a4bfaea7afa5618