Merge "Fix flattening/unflattening of android::Sensor."