Merge "Add VersionCodes.CUR_DEVELOPMENT" am: c3bba8a760 am: f70ea696f8

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

Change-Id: I243cc51ad1ed960a771b1923281285d5e0ce630e