Merge "Use Build.FINGERPRINT in favor of ro.build.description" am: 6f47e14bcd
am: 5e8082f594

Change-Id: Ibbd20493539c889713bedfaced297d5f50a4fd2e