Merge "update_device engine is now called by python2.7" am: ca03f968df
am: 1b048033c8

Change-Id: I275ab239bbedf12b8d63c2a69313441a3152266e
tree: a4bc5fb021adc86e8b4a80569988342fe1fa974b
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg