Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken