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

Change-Id: I58327058566f1a081dbfc2a3eac86bc8a726c7e5