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

Change-Id: Ia6136f973bb7e01f17935aaaab0e8c27c33ae2ac