Merge "Allow modules to be added to ART sdk" am: 41f4c3713e

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1398734

Change-Id: I9d82a725cea64c8380660537d538f7bd80f28ff7