Add CM product Apollo
Add my build.prop overrides