Merge "Update automotive makefile." am: 2c9568a071
am: 46296734c5

Change-Id: Ifd180e993d3fe5104ba7d89cd9faad7ba4af1d8b