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

Change-Id: Ie4128d1ea1fd08d51ae8e0aa24b14311f1667b26