Standardize to cm convention

Standardize to cm convention common-proprietary-files.txt andFix
setup-makefiles to localize apk's to target device