[automerger skipped] Merge "OMX VTS: Move device resource files to data/local/tmp" into pie-vts-dev am: 0571e8e8dd am: 493686b38e -s ours am: bdc642a346 -s ours am: e3d5eefd71 -s ours
am: c33f07fd71 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history

Change-Id: I412f875e40c94aeae7d5a8f5915e19ab797918c4