am e36fbea7: Merge "We don\'t need these libraries in our prebuilts going forward."

* commit 'e36fbea7691ab292bd4a372532b7de1685f13e74':
  We don't need these libraries in our prebuilts going forward.