Merge "Build: Refactor and clean up runtime_libart" am: 020f5275d5
am: bd7d5aea2a

Change-Id: I203c3da1abfc17a22eaedf719dd13a2b083a8680