Update headers (for export shared lib headers) am: ce9779412a am: c94c838023
am: 642afffeba

Change-Id: I6ce35bffb57c60ae1518665e4ad4af8b94e88043