Merge "close input&output Stream after reading assets"
am: 3658107061

Change-Id: Ifa49551c3cbe4d7367278efa6d8c26b37b251461