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

Change-Id: I45eead1c51b19ddb67f7a27f968dcc47dbaab327