[build] fix some build breaks on Ubuntu 18.04#18

leeminghao wants to merge 2 commits intopebble:masterpebble/qemu:masterfrom

wave-mirror:masterwave-mirror/pebble_qemu:masterCopy head branch name to clipboard