Merge "Depend on libandroid_runtime" am: 82dd9367cf am: 1a94090191
am: 634a10c780

Change-Id: Ia9e6e73d1ba4b25d1b3f5b4b1d0e5145f254db41