Merge changes I03a60d9f,Ib0b38f92 into integration

* changes:
  build: sort bootloader image sources
  build: allow platform-defined flags