Merge changes I108692a0,I14f97b28
am: 5493d63

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

Change-Id: I8f4bcce7e287c70b568824f9323d23ab788b7cf6