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