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

Change-Id: I66374bb95ec434acfd02ee1163300e3965776a4c