Merge "Add fastboot --os-version and --os-patch-level." am: 09f2af48fe
am: a1a254bf26

Change-Id: I2044de956a8849086173429d2e80fb0974e1d9c6