Merge "Freeze VNDK lib list on release platforms"