Merge "Change BlockingSocketReader to use MessageQueue fd handling" am: 48c7d27f64
am: b9b0886335

Change-Id: Id543589394c230b657ac150ab8fd4b9e388283eb