merge latest code
Merge github.com:XiaoMi/android_tv_metro