Merge "Add dependency on new location of pyserial" am: d7d7cd9020 am: dd29d8c7e4 am: d39faf0e3c  -s ours
am: 1fc0056ef1

Change-Id: If6fe03d2711edfc6997991f7127720fd6815754f