Merge "Switch to use ro.build.display.id instead of ro.build.id."