Fix temporary of older Theme engine x.x

Change-Id: Idc99f2ed451bdbcc75e35115110c4f7a8d97ec35
Merge https://github.com/XPerience-x8/android_frameworks_base_kk into HEAD