Merge "Revert "Tweak test app makefile with extra resources"" into oc-dev
am: 7e08c7ec17

Change-Id: I542f50f407964b30b0016400bb88348671a5c550