track our own bootable_recovery

also cleanup a bit

Change-Id: Ib85d5d6a4a3c55da8c9f32ef83be17d81ccca0e6
track our own superuser

Change-Id: Id246de11b6170cac4223c9d95aebe30d203b570f