Merge "Preserve left+right compound drawables" into nyc-mr1-dev
am: a58ff1dd87

Change-Id: Id2d0f9d74fd0995a4f45c7e8430ca5fffc581595