Android o preview 4
Merge "Fix a small bug in Log.h in LegacyCamera jni"