Merge "Corrected VehicleProperty.aidl path to current path"