Merge "Update loganalysis classpath" am: 4358b16cf1
am: c236b7ee23

Change-Id: I8a27ab0ffafcffc288741bb86eb1b00b6f2b8296