Sorry, I was off fighting fires in another area and missed this 
The quickest fix for the right stick at least is in AndroidInputInterface.cpp, replace
case AMOTION_EVENT_AXIS_Z: NewControllerData[deviceId].RXAnalog = axisValue; break;
case AMOTION_EVENT_AXIS_RZ: NewControllerData[deviceId].RYAnalog = -axisValue; break;
With AMOTION_EVENT_AXIS_RX and _RY
And in LaunchAndroid.cpp replace:
AMOTION_EVENT_AXIS_Z,
AMOTION_EVENT_AXIS_RZ,
With _RX and _RY.
I haven’t looked into shoulder buttons, but it’s likely something very similar.