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

Change-Id: Ib51c3f98488c2c389efb1590ef650c5ebd0194b5