Merge "Added platform-bootclasspath" am: dedc39bc2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660363

Change-Id: I2738dac3c1b8ab424127668925833d7e7635bc9e