Merge changes from topic 'use_bspatch_from_external/bsdiff' am: 218dfb0239
am: ebd32bf165

Change-Id: I2356faf1d11d71d15f571700b253871e3a2fac28