Merge "Update automotive makefile."