Merge "Change BlockingSocketReader to use MessageQueue fd handling" am: 48c7d27f am: b9b08863 am: a59b4d15 am: 853999f2 Change-Id: Idbdd164d46d928c6005f55574fc224b80ca6500c