am 4f734cab: am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread