Merge "Use libandroid_runtime lazily" am: 7c8020dede
am: c27fb9bc0c

Change-Id: I5e15f1e3cfffd95dbda641f13a7aedd9e63e4be0