Merge "Use ro.board.api_level instead of ro.vndk.version" into main