Merge "ndk: Update platform system libraries." into gingerbread