Merge "Include libavb in static libraries"
am: d65506217d

Change-Id: I43dac19bf88cf4caa23f4fb3a47171b8c2adfeb6