Merge "Convert PackageSplitRes task to java" into studio-1.4-dev