Merge "otafault: Clean up header inclusion." am: d9373cf621
am: ffc171c56d

Change-Id: Ib5d0676a143629c0151ad5e94052b67e2f626f49