Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev am: 3990c54224
am: c356b493c1  -s ours

* commit 'c356b493c1649295f53d34cfc660104ee4d5477e':
  DO NOT MERGE - Remove deprecated image defines