Merge change 25008 into eclair

* changes:
  Reorganize android_rules and android_test_rules