Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread