Merge "OMX VTS: Move device resource files to data/local/tmp am: a54bf6ed5a am: 31cdf15c5f" into qt-r1-dev-plus-aosp
am: 2fe511fd85

Change-Id: Ie62ead8a9daa3537ae52bf395d19bda3c67fe08d