setup-makefiles: Allow for apk and jar blobs

Change-Id: Ia45d6f61813f8ecd098d4ae2010739a214bf4552
Merge branch 'cm-11.0' into martincz