honami: Clean up old cruft

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