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

Change-Id: Ib1d2d9ecfd7d559114258359e1408849549c2eae