Merge "Allow warnings in modules/camera/3_4." am: 1d83294190
am: 37724db429

Change-Id: If9cfc40c749bff7d11303543994fde9e2067838b