Merge "Add -ldl for opannotate, oparchive, etc, in pp/Android.mk"