Merge "Move value for the Build.CUR_DEVELOPMENT constant into libcore" am: 3e6c189c68
am: 50351bd85c

Change-Id: I155559d6c283e58c14995cec8423924ef14bd5b0