Merge "Use new build var to depend on an APKs resources"