Merge changes from topic 'use_bspatch_from_external/bsdiff' am: 218dfb02 am: ebd32bf1 am: fc06862a am: b9fa8599 Change-Id: I75f1bc46a3da3b30b98022d9d6a2b5918b4bcd90