amami: Clean up old cruft

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