Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am: ac3fe8fffe

Change-Id: Ib09cea9ca5c6bb18dc16ffac70f23fa4b3ffd974