Refactor the logic for vendor blobs APKs
am: 905dd3d103

Change-Id: Id8fb1a5d3d53ab33d410ee67acdadccddb50e919