Merge "Consolidate loganalysis and tradefed build rules" am: a30353f9c8
am: b8e659ce2f

Change-Id: I5a73e71f8c473a5e0ed2bf9abe820046e319a9af