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

Change-Id: Iccbd357659eb88f5649507c9b844e4555203e97b