DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363

Merged-In: I853d177623dc64fdac70ddefde3e0cc65d6b2c9a
Change-Id: Ie3ef293de3ba2845985902a39dcf674d21941b8f
tree: d50ebb9f5f99c827f52e6c733642f75737f23892
  1. staticlibs/