props cleanup

Change-Id: I5c24f1de3b3ecab5992533ce59b129cadb2e7462
use camera libs from acqua

Fixes camera flash on Acqua.

Change-Id: Ib7eb52ef45ca675b82bdadd9d63831fb93779611