Merge "Add missing sensor types to <android/sensor.h>." am: ced274e88d
am: 4dfd5da62d

Change-Id: Ic4f660a8817670f30075556f460cfaf8594b59b1