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

Change-Id: Id9552ad6fb255be817f177ae47643a4108ed9704