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

* commit 'adacf30ff3bd68d2ac948ed431e0faff827b1fce':
  Update headers for proprietary code compilation

Change-Id: Ie50be54cec48fc346c812d29775202cc43a2ae89