Unifying readable-stream dependency

Change-Id: Id367c105eeda333ab5a675ada72e1a0649317b47