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

Change-Id: Ic5386840b19abedc1640517c8ad4afe45ab362c3