inline unnecessary typedef

Change-Id: Ie33e6b9038d6c18482c2ba7aa47f62d23973ab08
convert HITTEST #define to enum

Change-Id: I2a4066c66894e0bd9c349a7c5b8db3a8398451d2