Remove duplicate import

Change-Id: I65c41787fb8e33d5ef850d7604eec4cb05b86c42
Update to 3.4.92
Merge commit '9eedee281acff68fbf51a3df1bbe57e77aaa5c47' into rojak_cm11_wip