Update some headers from nAa ics_chocolate

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Idc1dfeafce291f8ef26709b0d59e4402d40e0bfb