Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e
am: 491880ed2f

Change-Id: I435d214295a39351fb447dabdcbe07ca51705b67