Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b am: 1478481533

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315

Change-Id: I2508231eb6b38f921d5271d039f5fd35d71b020e