[automerger skipped] Merge "Update automotive makefile." am: 2c9568a071 am: 46296734c5
am: d18cf33db8 -s ours
am skip reason: change_id I84b659b163b63d39535b462a3df8a9c19f680976 with SHA1 b91ac5c6a0 is in history

Change-Id: Ic4577f27c872cf9c7335dd9a93db56fea7e67388