Merge "Revert "Tweak app makefile with extra resources"" into oc-dev am: fb63fc2c6b
am: 0f06aaa508

Change-Id: I54faf5198a845a0c123e46d4e49a04bc1751a9b7