Merge the tizen patch and fix build err based on 1.12.2

No match.