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

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

Change-Id: Icf6cca47168a432ae7140eb557c81b9ef909e541