Merge "Support partners to expose their own system libs to Android apps" am: ad5ed892a7
am: a91e8d0152

Change-Id: I88c7c343a69adbd7687784ceb87fdde79a3baf2e