Update headers for proprietary code compilation am: 82cdbb6 am: 6712b85 am: adacf30
am: 47e7517

* commit '47e7517366ca0a9ef87a784b049413c6b4182ce1':
  Update headers for proprietary code compilation

Change-Id: Iadde46d81095547ce284d8cc9e5a1d400e265f3b