Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b am: 941bf55f9d

Change-Id: Id21167f5d7fd952b788344580ddcc676fce3d133