Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS"
am: 2849d4f9d9

Change-Id: Ie80905cfc47c7d46bae00e7a0d01907c5401ee34