Merge "Use vndk.private: true for VNDK-private libs"