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

Change-Id: I757aab5c0ad8cdd9ca705b2e1b6f328f30978a30