StaticKCM: Remove pre-StaticKCM code.
am: 13ea02dd9c

Change-Id: I18c82400d41b5a0cf259398dd1c08a4a7655212d