Merge \"Fix support lib build DO NOT MERGE ANYWHERE am: 287c5a0be2  -s ours am: c54d14d35c  -s ours\" into nyc-mr1-dev-plus-aosp
am: 52a70c3a0e  -s ours

Change-Id: I486afe9a7c9b3ffd23c5f5cf2e4930fe07404c2a