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

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

Change-Id: Ica2149d5b0046378f9ab7a06ec8a284cc58a5ac4