Merge "otafault: Move to soong." am: 475794a9af
am: 2812e5d16b

Change-Id: Ie5b169867b46fd269a3b2bb9e4a9f8f32aaea98a