Android O IOT Preview 8 (4718959)
Merge "camera 3_4: Fix compilation errors"