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

* commit '6712b859bddb6bf5e71fd390fc0f07ded6b62548':
  Update headers for proprietary code compilation

Change-Id: I3f03d0a140dceaad921b583575f1889ac45c6f51