Merge "avb: move to external/avb." am: 8cb66d9004
am: 55b441275c

Change-Id: Id8108b6774258526ec68ae38e0e8ad471e85cbf1