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

Change-Id: I8fc7a8a4d9a281661460167a71bc669c42b61fc8