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