fix
Merge branch 'du44' of https://github.com/DUXSTE/frameworks_native into du44