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

Change-Id: I04985a0afb2d7c855ff0a20a70c701e0fbb2a8e9