honami: Clean up old cruft

Change-Id: I9eb7a9283a519f3380f1dca242350dbf4be8da0f
honami: merge Sony 4.4.2 changes

Change-Id: I0c4d5129164cab17877b412595bdc076cd25afff