merged changes with shinobisofts CM repo to allow easier building for all variants
added files for easier variant building for Shinobisofts CM repo