Merge back into jhugman fork.

The intention is to get the jhugman fork to be the same as the mozilla/apk-factory-library.