Merge "Clean up generatePackageInfoFromApex() API"