Merge "Revert "Tweak app makefile with extra resources"" into oc-dev