Merge "Allow warnings in modules/camera/3_4." am: d8bffba62a
am: dd67309182

Change-Id: I817f8ccfd10b28b5ecd5b948b1e493259478e2d2