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

Change-Id: Ife115c0142baf5f4018d8cc22edb577aac2a03a6