Merge "OMX VTS: Move device resource files to data/local/tmp am: a54bf6ed5a am: 80fb244de2 am: 33713c1f32" into qt-qpr1-dev-plus-aosp
am: e23cf76e59

Change-Id: Ibdddae62bb4bd03be7febaeca93a49c1301ef1c3