build: Avoid poisoning the host binaries with bad ABIs

Change-Id: I5fa78a7a8d35cbf4d6f19f92863ee2194f2c30e1
add missing camera blob

Change-Id: I58c0b8f90d751048e5dcc8cfd2e5661e2959c77d
Merge remote-tracking branch 'cm/cm-12.0' into lollipop