Minor adjustments to battery.el on Android

* src/android.c (android_query_battery):

* java/org/gnu/emacs/EmacsService.java (queryBattery19)
(queryBattery): Reorder items in value for consistency with
Fandroid_query_battery.

* lisp/battery.el (battery-status-function): Select
battery-android only when android-query-battery is present.
(battery-android): Return temperature and correct values of
power source constants.

java/org/gnu/emacs/EmacsService.java

@@ -1212,7 +1212,7 @@ public final class EmacsService extends Service
     temp = battery.getIntExtra (BatteryManager.EXTRA_TEMPERATURE, 0);
 
     return new long[] { capacity, chargeCounter, currentAvg,
-			currentNow, remaining, status, plugged,
+			currentNow, status, remaining, plugged,
 			temp, };
   }
 
@@ -1289,7 +1289,7 @@ public final class EmacsService extends Service
       }
 
     return new long[] { capacity, chargeCounter, currentAvg,
-			currentNow, remaining, status, plugged,
+			currentNow, status, remaining, plugged,
 			temp, };
   }