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

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

Change-Id: I73041ce944e56646824c7a0c5536298f1f610b77