[automerger skipped] Allow codename.fingerprint format for targetSdkVersion
am: 5c87791a -s ours
am skip reason: change_id I4e3b1274cc32038b00b292dc6d67559eb320e9e4 with SHA1 10932871 is in history
Change-Id: I5d0c0e8c61cff2c1d2535f75028967c27e708392