[automerger skipped] Merge "Move bootimage props to vendor/build.prop" into...
[automerger skipped] Merge "Move bootimage props to vendor/build.prop" into qt-dev am: 509fb24d -s ours
am: e43e67d8 -s ours
am skip reason: change_id I9e92c1ec7068ae18fa0d709c77eac22a6b88c3d8 with SHA1 15794ca0 is in history
Change-Id: Ie9ed802e1b69db9d398ea940f0e6e537dcd5435c