Merge pull request #3311 from Phatcat/analog_input_android [Android] More analog input configurations + misc
