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

Change-Id: I2d9d4ff414fe970a8be246a505487a2ea4037899