Merge "Include libavb in static libraries" am: d65506217d am: 967f9715c3 am: ab9218c64f
am: efb59f9971

Change-Id: Ia64f945476f38bbe5047c5a62d4e2ff08e84eaec