Reopen to 4.1

And make BUILD_DISPLAY_ID follow BUILD_ID

Change-Id: I35dbd99241f3c756d707fa44642113ede939724a