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

Change-Id: Iffc125b995827c455fb4f2c3b2dca15de3321a86