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

Change-Id: Idbdd164d46d928c6005f55574fc224b80ca6500c