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

Change-Id: Ib1ef7ab4481cf24a5f9a4eb8c03963355d28de5b