Merge "Add fastboot --skip-reboot flag"
am: 60a99eb8f7

Change-Id: Id3ee7f6603437fae7ed26e8af93235f6531e0219