amami: merge Sony 4.4.2 change

Change-Id: Ic23f3bcbcb22d014b13792a9aaac64036e71686f
amami: Reorganize proprietary files

Change-Id: I50d1e46f8a7161b82df1d141606782758b83c5e5
Merge branch 'cm-11.0' into kk_mkt