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

Change-Id: I71a757916772a332a06620ff8d80b1a235195f4d