[automerger skipped] Merge "OMX VTS: Move device resource files to data/local/tmp" into pie-vts-dev am: 0571e8e8
am: 493686b3 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed is in history
Change-Id: I69985a36fdf1738a7f621748556c27b720c683e2