Merge "Add missing union members to ASensorEvent" into sc-dev