Merge "[automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am: 84cd010990 -s ours am: 0be2a64b31 -s ours am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history" into qt-qpr1-dev-plus-aosp