Merge changes I108692a0,I14f97b28

* changes:
  Remove symbols and header prior android-9
  Remove lib-bootstrap libraries