Merge "vndk libs - frozen true"