Merge "Regenerate make files for Vehicle HAL 2.1"