Merge "Remove the Build.VERSION_CODES.P0" into qt-dev