Build: Make flashing sexy it'll be fine

Change-Id: Id4a69106f9f7fac5b80dac6956e51d0751c8931f
Merge remote-tracking branch 'blk/blk' into blk