af753a2dfc
Also cleanup unused macro in ImageReader. Bug: 10360518 Change-Id: I2332703c92df771a6339ff92069e92d50a6c5cd5