Merge "Tweak app makefile with extra resources" into oc-dev am: e724c7b637
am: 9842b4a7fd

Change-Id: Ic48d984be02fb13395c4d735e673d9e7b1ea7369