m8: consolidate builds

Change-Id: I84a3e78254d69b8b740a6fb8b8ff0c4abd9c8e14
m8: regen blobs

Change-Id: Ib073901834e0019b00664594c422a0a41354afb2