Make the enums signed int, remove unused info.
am: 5ea3ece7ca

Change-Id: I02051a11fa0af6cd05ad796a0f0b3e11ee2a910e