Merge changes I108692a0,I14f97b28 am: 5493d63
am: add4f57

* commit 'add4f57f35f78b9ebc89a43e9e0e0d01d0686903':
  Remove symbols and header prior android-9
  Remove lib-bootstrap libraries

Change-Id: I37b27f1cbf6578bfcfa5d8e527501cb51bf0064b