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