Merge "Change FileStream test buffer from char* void*" am: b839befd7b am: 47be78e523
am: 5d63c53071

Change-Id: I79fed846a0d7bd20be13a5d3845bfe1a171f5b62