Merge "Use buffered DataInputStream vs RandomAccessFile" into oc-dev
am: b4a032fd02

Change-Id: I1ef1890ae7965da56c1799495aa49727b1d844a6