AICP_OTA redesign, part 1

By Austin Kinnetz

Change-Id: I91bf2a19b10ac06e54e51725c0e2b068712c8c97