Merge "Freeze VNDK lib list on release platforms"
am: f636d065bd

Change-Id: I926ed105da6627f03d614a1d8196c35bdc378eaf