Merge "Fix enum ordering in sensor NDK"