[automerger skipped] Merge "Remove unneeded bootimage properties" into qt-dev...
[automerger skipped] Merge "Remove unneeded bootimage properties" into qt-dev am: 669a9dbd -s ours
am: 0284f253 -s ours
am skip reason: change_id Ibbeff9870a5b71e83c2cceeb1327b12600077b23 with SHA1 f2998895 is in history
Change-Id: I064a0dd995b90b5390cc84a05c6b3d7048bce85d