Merge "AHB: add camera usage bits to vndk"