Merge "Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR"