Merge change 4194 into donut

* changes:
  Test that rebooting by broadcast Intent requires Permission.
tree: f685a0c39be96b3ff9649a2986fd7aa5e8c6d325
  1. tests/
  2. tools/
  3. Android.mk