Merge "Allow native:vendor to vendor apks"
am: f2fc1418d3

Change-Id: I36e8d2d7cbb16f183cf0cfeb0fc33f8360984af4