Merge "Add support for building split APKs"