Merge "Update sensors framework for HAL 2.1"