[automerger skipped] Merge "Add bootclasspath config to its own makefile" am:...

[automerger skipped] Merge "Add bootclasspath config to its own makefile" am: e13277f2 am: a29f2ba4 am: dc73dc06 -s ours

am skip reason: Change-Id Id3f91e387bba2e0525b4010f22fe380d1d8be537 with SHA-1 5add55ed is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1511788

Change-Id: I8db3d2edd2ddd801aacf310b088b98c5f4156e17