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

Change-Id: If433c6eec77fce2238838ebe0259b36d8a800c7d