Merge "Fix handling of #elif."
am: debcd02d18

Change-Id: I13666feb588154e742af118d8e2e952dd1ba85dc