Merge "Tweak test app makefile with extra resources" into oc-dev
am: 2b1df4ec14

Change-Id: I861ebd781bec4c41582c9a11f9cb79fb8982be18