Merge "Allow modules to be added to ART sdk" am: 6bae78fd14 am: e9edd4e2cd am: 39dcdc98cf

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1399203

Change-Id: Ia1f02beda982863dd5490eaec78e2f34c0fd125c