Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03
am: eb4ab6899f

Change-Id: If365f7e143f0ed557f8c904b4ae422650dc0ba32