Merge "Add missing sensor types to <android/sensor.h>."