Merge "Remove comma after $(warning)" am: f10d330fcb am: c41557dbfe

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2011875

Change-Id: I0d97a6699d4d46f935cc82fa998825d8db1e6c3f