Merge "otafault: Move headers under otafault/." am: 4289deaf82
am: 0018b93b27

Change-Id: I4b0c15c957e324e290826167ee073d7a75f5476f