Merge "applypatch: Use static libs for libbrotli and libbz." am: 4f86af7b9a
am: 5108b0b7f4

Change-Id: Ib112b7c8ecc533224459c045329a19e50e68f389