Merge "nativedisplay: Fix types in ADisplay.cpp" into main